Merge from trunk.
authorDavid Engster <dengste@eml.cc>
Wed, 13 Mar 2013 21:56:55 +0000 (22:56 +0100)
committerDavid Engster <dengste@eml.cc>
Wed, 13 Mar 2013 21:56:55 +0000 (22:56 +0100)
commitc647df1a9f01ce8ce689893d6ccdf13d6e7fad6e
treede6ad7f926dc0a6ba209094dcd42505f68a575e2
parent18aafde97c87a31c098d0904dfb2560674099d41
parentd54382c687c5fb5693e0efd062981ddcd931677b
Merge from trunk.